* vc-git.el: Comments.

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 27a2f8b3d4d584dcf3cc03b82d38103d30da3e1a..e9d55336af7ba7cb1f44ba7e654872deb56ded7b 100644 (file)
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -798,6 +798,10 @@ This prompts for a branch to merge from."
 (defun vc-git-find-file-hook ()
   "Activate `smerge-mode' if there is a conflict."
   (when (and buffer-file-name
+             ;; FIXME
+             ;; 1) the net result is to call git twice per file.
+             ;; 2) v-g-c-f is documented to take a directory.
+             ;; http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01126.html
              (vc-git-conflicted-files buffer-file-name)
              (save-excursion
                (goto-char (point-min))